From e3880748da2b2bae361eba00b1c8b63033a8986a Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Tue, 21 Feb 2006 09:06:09 +0000 Subject: [PATCH] Make sure we always update the virtual root, also when ->priv->root is 2006-02-21 Kristian Rietveld * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered): Make sure we always update the virtual root, also when ->priv->root is still NULL. (Markku Vire) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/gtktreemodelfilter.c | 5 +---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1ebfce3cfd..b317a1271a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-02-21 Kristian Rietveld + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered): + Make sure we always update the virtual root, also when ->priv->root + is still NULL. (Markku Vire) + 2006-02-21 Anders Carlsson * gdk/quartz/gdkselection-quartz.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1ebfce3cfd..b317a1271a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2006-02-21 Kristian Rietveld + + * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_rows_reordered): + Make sure we always update the virtual root, also when ->priv->root + is still NULL. (Markku Vire) + 2006-02-21 Anders Carlsson * gdk/quartz/gdkselection-quartz.c: diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c index de08f80b31..38beb9f818 100644 --- a/gtk/gtktreemodelfilter.c +++ b/gtk/gtktreemodelfilter.c @@ -1910,9 +1910,6 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model, if (c_path == NULL || gtk_tree_path_get_indices (c_path) == NULL) { - if (!filter->priv->root) - return; - length = gtk_tree_model_iter_n_children (c_model, NULL); if (filter->priv->virtual_root) @@ -2009,7 +2006,7 @@ gtk_tree_model_filter_rows_reordered (GtkTreeModel *c_model, } } - if (level->array->len < 1) + if (!level || level->array->len < 1) { gtk_tree_path_free (path); return; -- 2.30.2